| commit | 13b5caf8cbb6b62d411472c6e831aeee77393adb | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Tue Feb 16 20:41:38 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 16 20:41:38 2016 +0000 |
| tree | c7c697dcd5ef8465285f74dd49c7c6905a1e0f61 | |
| parent | 0e468faad559bb2edc7b0646943e54e84d9de312 [diff] | |
| parent | ce761d1fef4da2a4dec3eb538d103fcde1971dba [diff] |
Merge "resolve merge conflicts of c25621f0e5 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp