OSDN Git Service

Reconcile with jb-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:35:39 +0000 (08:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:35:39 +0000 (08:35 -0700)
commit6591be6c5296d29c12fde47cac2ebb82e23d021b
tree93d200becc2ae2e17794901b03ff69a5d32b5382
parentf6ee33cee717f9878d3a43bf76c35547649676d7
parente13338429f12ed760a690a02c268b128f90c5d99
Reconcile with jb-mr0-release

Change-Id: I5e181b92fbcc4b3d312396124a149f1c5224e55b