| commit | ab47d14f98063642fc51e2ec7f38be0abf16d14d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 27 17:06:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 27 17:06:36 2016 +0000 |
| tree | 6516c1c917eac6afbee16b4cbe37eda0c4567d76 | |
| parent | db62f10c1d1725fde836a0e2df627e1e3fbdbbdd [diff] | |
| parent | 694b2ec56e4c3f1922fac0144f7f793efaa5ffac [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e am: 694b2ec56e Change-Id: Id86af492599162f50c2b8ffe8ff0abfb37562872