OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:55:21 +0000 (07:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 14:55:21 +0000 (07:55 -0700)
commit792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d
treed0c142e7996c22f0fe450562ccde368e94ae2014
parent526abb0665aa6dbde9fc0689a88d90e01eba74cd
parentaef25b7d9c43b0e546312c819066b0684711ef7f
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibb666e518d3d41ce85b3276a702a28d191cdba92