| commit | a905c234da0dc7cb3558ad6846c902ba7c68d9c3 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Oct 26 16:02:39 2016 -0700 |
| committer | Dmitry Shmidt <dimitrysh@google.com> | Wed Oct 26 16:02:39 2016 -0700 |
| tree | 8f97fea278cf0215558e987e62f7cf0d6a36c67a | |
| parent | 7da5970d155fc9ccf9a19feaa2c60e72e8cc776a [diff] | |
| parent | d20fe45ed565dc4ef5e42607e7c0265af12af035 [diff] |
resolve merge conflicts of d20fe45 to stage-aosp-master Change-Id: I4669a7566205f01217c9104b489fed4ee8d3fe3b