| commit | 8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a | [log] [tgz] |
|---|---|---|
| author | Jeff Tinker <jtinker@google.com> | Fri Apr 04 00:30:27 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 04 00:30:28 2014 +0000 |
| tree | 4aac669d5768f0caa3c1e6eb4b2ebbc5d7dbd555 | |
| parent | ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1 [diff] | |
| parent | 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 [diff] |
Merge "resolved conflicts for merge of 4f342e87 to master"