OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:21:03 +0000 (09:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:21:03 +0000 (09:21 -0700)
commita2b8a756dba78e9c6e86717da0610e2826587ead
tree74f25fe97f8b088baeb209568355d5bf5c909198
parent7d910aabe3de5d16e6aa94176753f7a6ed74e3dd
parentd7be21ee78a9d1d3cb425f3163f5c19848325037
Reconcile with jb-mr1-release - do not merge

Change-Id: Iea091cf0ec873075e14c7a17ed185e9cbde68d1c