| commit | ea528d3a2e5cb0430235e1da5d0478d324be1bc6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Dec 03 19:08:34 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 03 19:08:34 2015 +0000 |
| tree | c1ee68b860e7424d8dd6d7663db68065914d7031 | |
| parent | d989d7e61a3d1b09111928160812f7cdcb89567a [diff] | |
| parent | 768d92ea617ec2a3bf1a7bf67b9ee2f2d8fd4df1 [diff] |
Merge "resolve merge conflicts of 7ec405ec38 to master."