| commit | ca4350405f968fa2a86ada8bc9da789471d56018 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Apr 30 12:54:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:54:31 2014 +0000 |
| tree | 51cd24518b1e35875755d3f2a1b01d969afbd2d2 | |
| parent | 53270c18aa1e8efcf5f379756661d0437c66341d [diff] | |
| parent | cb7560111186540d1b0e2b824272c11ed019ce22 [diff] |
am cb756011: am 822a9243: (-s ours) am 953d1d4b: (-s ours) am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit 'cb7560111186540d1b0e2b824272c11ed019ce22':