| commit | 1066fc61a371443e9423f890f6f7615f2d1e4c6c | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Mar 13 12:35:23 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Thu Mar 13 12:35:23 2014 -0700 |
| tree | 6723df81e6b9b9a55da1a5cfdf540a3ffc48ac35 | |
| parent | 8b91693683895a8b148f6ffea8944cef2ba8d99b [diff] | |
| parent | ad63d91439b3617a3d2ba9f1696ac7a27b5f9389 [diff] |
Resolved conflicts for merge of ad63d914 to jb-mr2-dev Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b