| commit | 3916845dda1289c3419fe21fbe335bcbddc2e354 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Sep 22 20:08:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:08:28 2015 +0000 |
| tree | 088cb49e729fe0cfccf78c10d5398f89c68a435c | |
| parent | 2460f11e9352c1b57513f9abcdf76d4e9cca81ba [diff] | |
| parent | 71a9b3243517d1c5cfeaf87d431d9d799504b17e [diff] |
am 71a9b324: am e22f5f49: (-s ours) DO NOT MERGE - Fix build for commit 69ae6a87 * commit '71a9b3243517d1c5cfeaf87d431d9d799504b17e': DO NOT MERGE - Fix build for commit 69ae6a87