| commit | 8d3096352caf669c013556ca0a434ab72ff47ced | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:10:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:10:18 2015 +0000 |
| tree | 2d1947a7c87bb2ff1d45b6e5e0c0e1591eff3557 | |
| parent | 27ac85b18c73785ac731ed6df2b862fd9c4ee135 [diff] | |
| parent | fdcb8bbb86fb4aca2d2e4fc923e3c9172d24dcb0 [diff] |
am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit 'fdcb8bbb86fb4aca2d2e4fc923e3c9172d24dcb0':