| commit | 6ab0f7a9196c3d1fc7676970febb364395c9f050 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:45:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:45:49 2015 +0000 |
| tree | 0835c96c5482a13d4981ae589798a4e25e16df7d | |
| parent | 19cf6f34802a3cc8de3d69d6111371cf5e6c0895 [diff] | |
| parent | e8566ffbd9c3aa5d3c298fb00d849e2667a26519 [diff] |
am e8566ffb: am c0b3754c: am 98970843: am 4dec9d0d: am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit 'e8566ffbd9c3aa5d3c298fb00d849e2667a26519':