| commit | a42cb8b0e2b8fdfbac1a6590d6b60814caa01088 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 21 13:11:02 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Mar 21 13:11:02 2014 -0700 |
| tree | d903e1aca9c2345e98dbe99188524feef35b21c3 | |
| parent | fb40d78c57711585c9eaed467601bf3adb4f60f9 [diff] | |
| parent | a67e34c80fb5b1936fe0beeea3faec3218ead1a3 [diff] |
resolved conflicts for merge of a67e34c8 to master Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2