| commit | 6243007922f8bc2b22ba8ab5aaa83ee9a58bf4be | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:35:36 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:35:36 2013 -0700 |
| tree | fc415520c9b4b0f86f07dc3219fef925f04f04a0 | |
| parent | 241fc404a69a81b4ace2d723254ce1e1eb5dbe53 [diff] | |
| parent | 4e53b8aa864f0b56f2449565edad1c5760d0a461 [diff] |
am 4e53b8aa: am 7799c2c0: am 97a79323: am ff01f6e3: (-s ours) am 5cefac4a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4e53b8aa864f0b56f2449565edad1c5760d0a461':