OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:11:22 +0000 (10:11 -0700)
commit5cf79292b8838880e6059bca7e2415161d0dfb84
treee842ce919d0a66171876083122259758ea555ebc
parent1e442932f876bacc96147093c2c37074e590519a
parent65549826144ce9a2de9d09e86c61d1b1e350e69e
Reconcile with jb-mr1-release - do not merge

Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb