| commit | f671d5bbf8bdba4076be34b254e9e5f7d3f4b874 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 18:52:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 18:52:06 2016 +0000 |
| tree | 49db0f9281ef8d49650fa22af9dec7739810e350 | |
| parent | 1f1fa8ba374b83eadeab27c98309a54e1e827394 [diff] | |
| parent | 311f99eade1222575bc65a2fcbd9f9a5a40d2024 [diff] |
resolve merge conflicts of 70066d9 to stage-aosp-master am: 311f99eade Change-Id: I8264ed7436d6ffce3106085efad14a58da2f50b5