| commit | 852a4c761d49668d80128cb61423e0a1448c341c | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Tue Aug 23 04:32:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 04:32:30 2016 +0000 |
| tree | 9a4c90c8a5afdd8791bd0acb0d8bc75468d70ca9 | |
| parent | 694b4880d8987af850710383d1e8a63d2c472677 [diff] | |
| parent | 559cc01e3e2c6c5ed1cb2a0ca003ff48b5d0f41d [diff] |
resolve merge conflicts of 40eff95 to stage-aosp-master am: 559cc01e3e Change-Id: Ief493c828bc7e03967a2bb5d439a7a4fd638a253