| commit | 50ce65d97eaf52547f31bce46fbd3437153d497c | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Tue Jun 14 23:21:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 23:21:52 2016 +0000 |
| tree | 508d46f957bbdd03ecf8293345f29028166fc60d | |
| parent | 2dc471052f7c58e27f44810dcdec9ff837814247 [diff] | |
| parent | 3fecf887bc0494a00f76e0e4db107cf96c678ea3 [diff] |
resolve merge conflicts of 998f507 to nyc-mr1-dev-plus-aosp am: 55986c02fa Change-Id: I302a81a45b9eb788fe3ca17154cc2f25efe034fd