| commit | 445d2139efb0a8787a2f7479889f125c31902483 | [log] [tgz] |
|---|---|---|
| author | Vinod Krishnan <vinodkrishnan@google.com> | Fri Jun 06 01:54:10 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 06 01:54:11 2014 +0000 |
| tree | f3e7cdb04df65be53eae3208094b9a5c1175f9c8 | |
| parent | fca5f5234734d0ac452a6da19918c368481fa246 [diff] | |
| parent | 067351f876e45c7c319af2eb188fc0c3225e7656 [diff] |
Merge "resolved conflicts for merge of a3d5d3b8 to master"