| commit | 83ae8a4ca9cec88e8e4a464259976a7735e9df9c | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Thu Jun 30 23:54:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 23:54:04 2016 +0000 |
| tree | af22ddb794c5b7a936ba6c29c19f6e7e007dc269 | |
| parent | 3b2288e3e08572a827990f7bddc2bb8fe89b444d [diff] | |
| parent | e6350dfdddc0ce9cc1a62d01782ae48ffba74f64 [diff] |
resolve merge conflicts of ff3341b to stage-aosp-master am: e6350dfddd Change-Id: If8afcbb7b2734866b1e0ed26760c1cc1fe235634