| commit | e8e81563305b2ef2b8082dfc4b28d22b50c76eb4 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Jun 29 17:41:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:41:17 2015 +0000 |
| tree | 60ecb5a0a173022524d5810e930f0d4064697b21 | |
| parent | 7a3235c598fa46fbc540746648f129f6ef8dc647 [diff] | |
| parent | 5aa2fe13b5c5f7d34f653e70943b45e0231c5d09 [diff] |
am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix. * commit '5aa2fe13b5c5f7d34f653e70943b45e0231c5d09': [DO NOT MERGE] Build fix.