commit | 89d702ac6864e0111ea2f16a524c71804bae5a5c | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 15:22:22 2012 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 15:22:22 2012 -0700 |
tree | 50325b282bb21cb5af1f75e915c61dfdd1a7fe4e | |
parent | 8b16c219f08521996a393c46a386185bb96903c6 [diff] | |
parent | 051f46d7987b53937a9d816585eac02ecb564036 [diff] |
resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp Change-Id: I73165a3d77318cbb0271e0d5c64cc49caad8f693