| commit | 4f78bca7814e0a3c4954d325597479aeb313c941 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Thu Nov 19 02:51:40 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 19 02:51:40 2015 +0000 |
| tree | 590dfa05558941d9612015df77054ffd0f22cfb1 | |
| parent | 76415ee5008a60e015a2861f75de3a44f60741cc [diff] | |
| parent | 17b1c2cf9a2e049ca1f2e4839c4cfaba6028d1fc [diff] |
Merge "resolve merge conflicts of 7d1428d7f3 to master."