| commit | 34182940927652fc1f2d50326dfbe2f7d135320d | [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 | f1ab8c1d3fea85c9c90013d0b33200d13e010384 [diff] | |
| parent | 9d6e550042024f46f02d492a1c11911f0df2f885 [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master am: 7f5b29ff1e am: 694b2ec56e Change-Id: Id86af492599162f50c2b8ffe8ff0abfb37562872