| commit | 635d52887704194420f6d1eb5cf6814d731ed1b0 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Mon Oct 31 18:47:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 31 18:47:52 2016 +0000 |
| tree | 8518c7af2ec0435a244c25f073dbab9e3fc1e221 | |
| parent | 3030cd855b3e1678c0855d1c30bd334da1ba6992 [diff] | |
| parent | 879a5169ec226fa6b8c0c6d1e97e17591ee4a817 [diff] |
resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66