| commit | 965bba34341470fbb8541a4ade7b772a435ec3f2 | [log] [tgz] |
|---|---|---|
| author | Amit Mahajan <amitmahajan@google.com> | Tue Jun 10 18:38:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 10 18:38:26 2014 +0000 |
| tree | 1041e1054476b6e4c3591b59a9eb7c90344a0696 | |
| parent | cdb4a446de27789911d0ccb58fdede548abd3687 [diff] | |
| parent | 0409e9f0af69e1941b025c6c5cb788036a9dc7b6 [diff] |
Merge "resolved conflicts for merge of 437a77d4 to master"