| commit | 512d09d3ecfafc0d52055612a3536e8b20a7df93 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:19:02 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:19:02 2013 -0700 |
| tree | 68b4da9e56f1e40f17ee83d225dbd631a2043f56 | |
| parent | 71ad7914aef61b7fd7785fd7db4a4e09a2be787f [diff] | |
| parent | 9bffd1e9044f3b54752aa5389d457fb790e67f53 [diff] |
am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9bffd1e9044f3b54752aa5389d457fb790e67f53':