| commit | 7adf406c6e6d4052ffd67f710e7583ec792b3f44 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Aug 05 05:48:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 05:48:17 2016 +0000 |
| tree | f08a99b1488838d417dc863675b47928c7232468 | |
| parent | c82b93a847aefaaf115d8e113877d53f286d09d1 [diff] | |
| parent | 89df4b62475d555e9dbf6723a13ac7cbd184783d [diff] |
resolve merge conflicts of e012de5 to stage-aosp-master am: 4ff7f9f62a am: aef02526b5 Change-Id: I6c07ac4d130aba1056f9cbd28d41c0b299832eeb