summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-19 08:37:10 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-19 08:37:10 -0700
commit6714442782cc96bfd6c88e8a4f1fa8659d146da7 (patch)
treeffed677c554751fd8f60e9dbb11d262632a523c6
parentee2585e5bce29f90eebaf2ce32826fa75dac17cf (diff)
parent0adcd141c076c309cb19e4828cdd22be3018b0bc (diff)
parentf186b07b463447707117e2b54fc02f7ed30d6e43 (diff)
downloadframeworks_base-6714442782cc96bfd6c88e8a4f1fa8659d146da7.zip
frameworks_base-6714442782cc96bfd6c88e8a4f1fa8659d146da7.tar.gz
frameworks_base-6714442782cc96bfd6c88e8a4f1fa8659d146da7.tar.bz2
Reconcile with jb-mr0-release jb-release
Change-Id: I0249d315e647dcdc2f3dea4d258ef5bf2065731d