| commit | 74c6a154935fc932d4da330e0615680d50f34f48 | [log] [tgz] |
|---|---|---|
| author | David Friedman <dmail@google.com> | Mon Feb 23 23:03:35 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 23 23:03:37 2015 +0000 |
| tree | 1a4b97774036c9542916f5fb67bcf2396fc4926f | |
| parent | f3c7276a4fea750ea42c055e63beec855fe95432 [diff] | |
| parent | 704ebab343b80ca8d483a7a35d690cbae58475d5 [diff] |
Merge "resolved conflicts for merge of 6248cdd5 to master"