| commit | 5a8424ba151434fd4779a66e7b5ee591668329a6 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Sat Oct 01 00:47:06 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Oct 01 00:47:06 2016 +0000 |
| tree | ea627064db920e541b25da42d9d93f9ae12838c3 | |
| parent | 0383876fc5d02f35e05e5c41e0b2335dcdcc2d41 [diff] | |
| parent | f7c50104b07091880019f4ecc70d977961148268 [diff] |
Merge "resolve merge conflicts of a3de77f to master"