| commit | 77956aea592c077d5671f26ce754f2c9eba780be | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 28 13:30:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 13:30:01 2017 +0000 |
| tree | a92257e7457ca16edf9db4d5b6e2d04d5ab464a3 | |
| parent | db8cef6824361d18206e0d242b624e648a800995 [diff] | |
| parent | 0f570c4fcb63b52f1192a4f4f41de17bbabd19c0 [diff] |
resolve merge conflicts of 20d9cf2ee to stage-aosp-master am: 22ca4f76c2 Change-Id: Ida22f5317a7b4422a69d92b3548c21166d61e5a0