OSDN Git Service

am e0ad4582: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:35:40 +0000 (07:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 14:35:40 +0000 (07:35 -0700)
commitddc709cf1539e6c893a456870fe1ef216db91c18
tree8b5f28f437e05648607258ed5647ba4626fb012c
parentced865f736e550514b140f07c3c1c6fa97e42e66
parente0ad4582ba0ff711137674dc35d207f835d62af8
am e0ad4582: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e0ad4582ba0ff711137674dc35d207f835d62af8':