| commit | b0c457a18ba4136a2cbbb10e8e4b7ac2d5019790 | [log] [tgz] |
|---|---|---|
| author | Julia Reynolds <juliacr@google.com> | Mon Dec 14 18:36:08 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 14 18:36:08 2015 +0000 |
| tree | ba4e9329deae655a91e2f9f3706f746bdc6d4cc0 | |
| parent | 3ab0c4c43e1e5b9efec7c0fd6928b127afcfb25d [diff] | |
| parent | 1ed208f800d9230c44b2f0a6cce0774bb30995de [diff] |
Merge "resolve merge conflicts of d1aa7ae6d7 to master."