| commit | c08c350193f66c523b9c1f0879b55bb7bba80541 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Jun 29 17:52:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:52:54 2015 +0000 |
| tree | dedf9f2dcd1ee1c06c686402029863b04492d569 | |
| parent | 3e9731388e95518ed03ca7b6370724f16ccfc046 [diff] | |
| parent | e8e81563305b2ef2b8082dfc4b28d22b50c76eb4 [diff] |
am e8e81563: (-s ours) am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix. * commit 'e8e81563305b2ef2b8082dfc4b28d22b50c76eb4': [DO NOT MERGE] Build fix.