commit | d8c6061a3c671399f8bac9b77a279f547f01cea5 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:08:27 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 11:08:27 2012 -0700 |
tree | 638d97d8374ad43338d8ccf7b41c9a3e50bffe98 | |
parent | 947c0028510cb51b95a2ae84b31e3b06aff2ee85 [diff] | |
parent | 9a7768a4f3fede135ab73098d6a2ae046b5d016b [diff] |
am 9a7768a4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9a7768a4f3fede135ab73098d6a2ae046b5d016b':