OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:14 +0000 (08:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:06:14 +0000 (08:06 -0700)
commit087328986922a36bef6f1829790e0840516405a4
tree94d6b17b7df696eb9e394e778bca44c9354c84ba
parentdee6975aaab2eeea21aa02bb4fc7f844e016048c
parent88cf19181afeb76c5c1444703ee402bf827238d9
Reconcile with jb-mr2-release - do not merge

Change-Id: Ib54cc659fb7a4fc18df8f98b1c12547d46e23e8e