| commit | b8750e114b6fd99768c45233d4b2ffb2b198f5d1 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 18:00:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 18:00:37 2016 +0000 |
| tree | 91b1d9c618270f0c4d663d4fef5d385c5ce2b535 | |
| parent | adc67b2078c7d4d52bb1deea21ba151f64f7cd13 [diff] | |
| parent | 7ad2854adc0abe8dd7909a6ed401107ad09bc3d2 [diff] |
resolve merge conflicts of 1c10de5 to stage-aosp-master am: 7ad2854adc Change-Id: I3779e9173a0d81e1e1be55dd069b520cdf854c14