| commit | c40e7dc4fceb578bc80c6821f05ec5f44d11546f | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue May 27 16:42:38 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 27 16:42:39 2014 +0000 |
| tree | 54a6ca4ff88eb4be8a2428828a341ad079546f0a | |
| parent | 667c77e4191949eb3ec974123418f1e77ea43af5 [diff] | |
| parent | 39c1f59541c806471bd538adfb981f26f58b647f [diff] |
Merge "resolved conflicts for merge of 754a8c4c to master"