OSDN Git Service

Reconcile with jb-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:13 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jul 2012 15:41:13 +0000 (08:41 -0700)
commit38beb75989f517071635750d26ae5b34ee8b4a84
treebcc854cbacc169e77cbcdb2ed8caa96201fadda8
parent12a2c9e41df573166e182d5e97067bfcb535558e
parent087265575a950d0bb26789abe98350bb7e8c0039
Reconcile with jb-mr0-release

Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b