| commit | 1d4518672c590b2f8af6c0561990e6a1daea5a40 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 03 21:09:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 03 21:09:18 2016 +0000 |
| tree | e4464ac4c037afa66042c1e0c6883710d4d4e53a | |
| parent | 43da1271b13672987d12dacce058c9bc29498215 [diff] | |
| parent | b6e1d15056f2a9c136a640336d78d36ab58a719d [diff] |
resolve merge conflicts of ed3596a to stage-aosp-master am: b6e1d15056 Change-Id: I7a8bda073ebbd1fd212aedd338aeed40398ff8c3