| commit | ce61bb6abd09be5b49a8e95905243d75a1e9abcf | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 19:27:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 19:27:17 2015 +0000 |
| tree | cd2a2983b84ae7384b2fb9192428a78bc9f69188 | |
| parent | b7d6e637c741aecbc3c84bbb259dbc9ab0cfa0f8 [diff] | |
| parent | 52a9a61bd0a213c250bf2e61b66353259d729cfc [diff] |
am 52a9a61b: am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE * commit '52a9a61bd0a213c250bf2e61b66353259d729cfc': Fix build break DO NOT MERGE