| commit | 75eed70935c476c2c45e9f7697fbbcab368bb858 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 00:32:57 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 00:32:57 2012 -0700 |
| tree | 391d67bf9d24091f4c84e7bcab11ea4d6659aeb4 | |
| parent | f9bdb738bd72cef94c867cd3b97dbb67cc2c612b [diff] | |
| parent | 4ee91d7fefa26e019fdc59038271d8316481cf8e [diff] |
am 4ee91d7f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4ee91d7fefa26e019fdc59038271d8316481cf8e':