OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:57 +0000 (07:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:51:57 +0000 (07:51 -0700)
commit05caa74872df1258bbf4473fe6d222a9487fe051
tree94c792fecaf7231721305c1ace5a04fe2558536b
parent6a52c12da5dfe279fa6fb4a0a02db49a0dfbc1de
parent2888da87eb910648665fb3e16f6b389b808997eb
Reconcile with jb-mr1-release - do not merge

Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44