| commit | e1112eff8a67009e865565580154dd27d49a665c | [log] [tgz] |
|---|---|---|
| author | Tim Kilbourn <tkilbourn@google.com> | Thu Sep 17 19:56:22 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 17 19:56:22 2015 +0000 |
| tree | 4271d70f7c8ecfecd18e9804ce5912976fa69c49 | |
| parent | 21c5f536eb0705c8e76a7f2f7ed5299a39dc381b [diff] | |
| parent | e13fb40ecb1579ad9686f1a45fceca3c633db724 [diff] |
Merge "resolved conflicts for 0816319a to master"