summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-08-16 18:56:53 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-08-16 18:56:53 -0700
commit2679082da074b29be8ac8e6f9bb02591318be388 (patch)
tree814988aae175fa4081aa6d53a91161608cc3646f
parent050c87f87e2a48c7bc90f5b15fb6e4e37e667286 (diff)
parented970b4899338227d944b68c980102c89b9d588a (diff)
parentb046b20f1a5406ddda60c548036ed9e887da49df (diff)
downloadframeworks_base-2679082da074b29be8ac8e6f9bb02591318be388.zip
frameworks_base-2679082da074b29be8ac8e6f9bb02591318be388.tar.gz
frameworks_base-2679082da074b29be8ac8e6f9bb02591318be388.tar.bz2
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Icb49e9e1f6c6e2be6d863f959a7a782dd442c465