| commit | ba5da60e62a1bea48bb6f240be117d8a09a967a2 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed May 14 00:07:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:07:37 2014 +0000 |
| tree | c2175942e3a631ad112fe6ab17da560c45fc1ae2 | |
| parent | 2348ebb22dbb61ff563c7e0785e2fc88fc43f726 [diff] | |
| parent | ca4350405f968fa2a86ada8bc9da789471d56018 [diff] |
am ca435040: (-s ours) am cb756011: am 822a9243: (-s ours) am 953d1d4b: (-s ours) am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit 'ca4350405f968fa2a86ada8bc9da789471d56018':