| commit | 822a92438a427c539ce392687252ec45921c8257 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Apr 30 00:59:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:29 2014 +0000 |
| tree | d480a9df18213d791f716ded764bcd22e74dbd2d | |
| parent | 9a7664506828bc0e3f5be74f6bd043f629a19c91 [diff] | |
| parent | 953d1d4b87c5460c259df3bf3defe988a2792e37 [diff] |
am 953d1d4b: (-s ours) am b7f61da7: am 7fa4c759: DO NOT MERGE. Fix merge artifact. * commit '953d1d4b87c5460c259df3bf3defe988a2792e37':