| commit | 8a775a6080144d5d667f43a5c576cc1ae4908b38 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Dec 22 14:16:29 2015 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 22 14:16:29 2015 -0800 |
| tree | 7facda023aed80216d2028db6b82108ed02f5c24 | |
| parent | 9f2a6e139fbe20b73f94233d135adf0f4bee6086 [diff] | |
| parent | 9f19e07a44f77a3f083012366de15e66c5ee61ca [diff] |
Merge "resolve merge conflicts of 715ecdadb1 to lollipop-cts-dev." into lollipop-cts-dev am: c6ffd4b897 am: 9f19e07a44 * commit '9f19e07a44f77a3f083012366de15e66c5ee61ca': collect memory properties in CTS