| commit | 90900748c2757cd255e3b55b057c4d95a51ddffb | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Wed May 28 00:38:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 00:38:23 2014 +0000 |
| tree | df5c85716d337c71405ff74d8ec8de25bf3df1f9 | |
| parent | b93ca08f4c8c3f77701055b9304e8c1f9220e8e2 [diff] | |
| parent | a3646cdca7c766e76d231bd0761584019d24ede5 [diff] |
am a3646cdc: (-s ours) DO NOT MERGE Cherry-pick: Fix master build: Android.mk automerged badly * commit 'a3646cdca7c766e76d231bd0761584019d24ede5': DO NOT MERGE Cherry-pick: Fix master build: Android.mk automerged badly