| commit | e4a9d859e10930f187fc037e0a1cc8d1eb5c21c5 | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Aug 21 18:59:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 18:59:11 2015 +0000 |
| tree | 849d18a0d5ad54470904bfbfe7e24004ede61cb3 | |
| parent | f8bf4acb505d8058e75b8b6f19738ee2c9a4322e [diff] | |
| parent | ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea [diff] |
am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGE * commit 'ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea': Fix build break DO NOT MERGE