summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:17:26 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:17:26 -0800
commitbcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793 (patch)
tree179a0608e444e8b009ee3a78ad115c44e47440bd
parent44be3fc486c049bbfea331b0fc2cff0552326f4b (diff)
parent5aa2282b21a141e6c705c8fb7b12e0d7548942e4 (diff)
parentf1feffe336e9979a94137152f0723b6f7ee66280 (diff)
downloadframeworks_opt_telephony-bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793.zip
frameworks_opt_telephony-bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793.tar.gz
frameworks_opt_telephony-bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793.tar.bz2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I178d3a86d8c71bca722ca5bfda136462b820c85e