OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:04:56 +0000 (11:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:04:56 +0000 (11:04 -0700)
commit5acc909860388a8863e3ec9d38a290fd418cce22
treef7e6a0da91865b9c5e385bfa1e5e34682ed99b5b
parent8756c500a1aa22b9b81eeeb7f25ec7246a1c1464
parent1b7776221253a7ea910955f0733e2e956f36f812
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie33aa8887f43fe794d289a745451db6fa73a9c20