| commit | 0e3d2736706df85349522c6969db10e9b72b796a | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Apr 18 17:54:20 2016 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Mon Apr 18 17:58:31 2016 +0900 |
| tree | e2415b9aec83880a9552e4d444cb0056f5985cb1 | |
| parent | c6ea9f7736ae97b12e6ee571369aefd5b175f222 [diff] | |
| parent | 72fa0d42e6c81420b6450618f3b764f9fd3dc96f [diff] |
resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp Change-Id: Id7f317a20e422b215efff89a5c71c9b445d18cf4