| commit | b5217c1831c474a996cc66497806ffdf60962b5e | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Jan 28 00:26:03 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 28 00:26:04 2015 +0000 |
| tree | 1082bc3a839ecb07b52aabb575eb8e5b532eb0e6 | |
| parent | ca360e14afca5dc6742308f1e801a632377c15b7 [diff] | |
| parent | 5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1 [diff] |
Merge "resolved conflicts for merge of b9470f3a to master"