| commit | 2afade582d400fb3f5444ce8995f1dd8d5281aa6 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Mar 15 10:20:24 2017 -0700 |
| committer | Colin Cross <ccross@android.com> | Wed Mar 15 10:20:24 2017 -0700 |
| tree | 06943dfdf3db9ba31e8b6c157c195ec5f1e62ca3 | |
| parent | 88430393685a3e4c0d0ddf91c49afcbc2d1e7107 [diff] | |
| parent | da00e137ec699ca96ef596c053e1fb0b66e4199a [diff] |
resolve merge conflicts of da00e137ec to stage-aosp-master Change-Id: Ie81c0f4f5f14ae3e51ee717a50d0c29b26161b90