| commit | 8effc00429d0eece67b65945d41844515a8e3742 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Tue Apr 22 18:30:09 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 22 18:30:10 2014 +0000 |
| tree | c389b377739c42c763c33791ef16a913d39f421e | |
| parent | 1990fe4e965f6cb5a65bf58f4764489cdc10acde [diff] | |
| parent | be4c2c2b9902ae2d846c205a3ea3ba8b437a0775 [diff] |
Merge "resolved conflicts for merge of d90712d0 to master"