| commit | e6350dfdddc0ce9cc1a62d01782ae48ffba74f64 | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Thu Jun 30 16:34:49 2016 -0700 |
| committer | Evgenii Stepanov <eugenis@google.com> | Thu Jun 30 16:34:49 2016 -0700 |
| tree | af22ddb794c5b7a936ba6c29c19f6e7e007dc269 | |
| parent | db9f3489bcad4408b3521c9b1c242e41e4ccff99 [diff] | |
| parent | ff3341b33bac9ab20427a0c7bd489f87caf8f663 [diff] |
resolve merge conflicts of ff3341b to stage-aosp-master Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a