| commit | 071863008a2b517e2328f2e703693a04d9797713 | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Tue Apr 01 21:47:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 01 21:47:55 2014 +0000 |
| tree | 6ba206b6c30b1b2d17640add5a858caa49051a76 | |
| parent | 9a1a0c8c3a4d94c7532dd69801096bb19130eabe [diff] | |
| parent | 4bb047fa5e6d43a027bfe1dfe23b3541e3910a31 [diff] |
am 4bb047fa: Fix build after bad merge resolution * commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31': Fix build after bad merge resolution