| commit | 4dec9d0da96c4bb8e8c138109ec8f60197f5095e | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Aug 08 16:23:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 16:23:49 2015 +0000 |
| tree | aa8db5a71d528f9f90719844cafc90b01483bdae | |
| parent | c6b7ecd791e61fc93a36ef56a70576ce0836b5a2 [diff] | |
| parent | d2bd9bafd91577990249a906611fae8820fce247 [diff] |
am d2bd9baf: am 8d309635: am fdcb8bbb: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours) * commit 'd2bd9bafd91577990249a906611fae8820fce247':