| commit | 70b4848fe3b18bc848d1963b709aeb078c9c464c | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri May 03 17:50:05 2013 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Fri May 03 17:50:05 2013 -0700 |
| tree | dd817345ac95ac506a6532941773f9865c549625 | |
| parent | 1634c64ce162d79aad96a7d7ca82fa0f750d5df6 [diff] | |
| parent | c7f23a5816367f4d23f1bd9ed7621fd27fc294ed [diff] |
resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28