| commit | 539fef836543c46cf0abee46bfac4a2eda3ee9f4 | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Thu Jun 30 23:58:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 23:58:11 2016 +0000 |
| tree | 1cbd46abd8e716be1999624b4406acc3fcef0678 | |
| parent | a3e8e9c6f33ecd57221b7fe0ab1bf9c5035351ed [diff] | |
| parent | 83ae8a4ca9cec88e8e4a464259976a7735e9df9c [diff] |
resolve merge conflicts of ff3341b to stage-aosp-master am: e6350dfddd am: 83ae8a4ca9 Change-Id: I5d8893e9da402aea5416e38a3b5c6ef9808d3b17