OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:11:13 +0000 (19:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:11:13 +0000 (19:11 -0700)
commitf9b00a844d6fc0d23ce62d42553b4fe180aec261
tree25c7018d0e08fac6c04f2657109b6947269e757a
parent32707597009c6a7b15113fb7dd4e89e029e96ff1
parent8bb5a08a6dd0c1634a475c5083a9a5ab262dfbb2
Reconcile with jb-mr1-release - do not merge

Change-Id: I6e4530661a9c7119cc4082297def851f063112c7