commit | 2e5b13ef952436a3794d36352f5a2a0381ca4ddf | [log] [tgz] |
---|---|---|
author | Irfan Sheriff <isheriff@google.com> | Thu Aug 23 14:37:06 2012 -0700 |
committer | Irfan Sheriff <isheriff@google.com> | Thu Aug 23 14:37:06 2012 -0700 |
tree | 34e1f48b675b38ce0b40b1a3514e8c5ba0f22452 | |
parent | 9447af12e290f2f5aaba38df9e5181274ef4d9c3 [diff] | |
parent | 86bb22584fd306faedc1b3fb7abd08c59f356417 [diff] |
resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp Change-Id: I5f115310948a03d791c201fb605dfbb576c0576e