OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:51:39 +0000 (08:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:51:39 +0000 (08:51 -0700)
commit1551f18af0c75c2b2c3ca61168fe4284b54f1a2e
tree1a39c823327d71e7b9d69f5620e07c227a72f724
parent8e1e66da21398b9ccd4ce68d855909e5eb53f6f0
parent536b1daf007cd81b183e1eefc68a9e822b1ac3ef
Reconcile with jb-mr1-release - do not merge

Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0