| commit | 21793c32beb6474f30c32c035281b278f42388fe | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Jun 14 02:20:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 14 02:20:26 2016 +0000 |
| tree | 5a665564e666ee76613baf5336f70affe635ee2e | |
| parent | ff38526b2210c44c629d92273e6487831050f605 [diff] | |
| parent | 38afad46d874c3446d38ee714f1ee4420de702bd [diff] |
resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp am: 38afad46d8 Change-Id: I597370534ef1bd4d65fea9e6054a499f88b282e9