| commit | 08134d0acdadb1c85c378c6e37a19e3e20698202 | [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 | 8f58d2d85ce0e16a3314b5b063d2921e64ba7005 [diff] | |
| parent | 97fae9f53a22d85794ac94aafecce33dceb3ec4e [diff] |
resolve merge conflicts of 40eff95 to stage-aosp-master am: 559cc01e3e Change-Id: Ief493c828bc7e03967a2bb5d439a7a4fd638a253