OSDN Git Service

Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev...
authorIrfan Sheriff <isheriff@google.com>
Thu, 23 Aug 2012 21:58:43 +0000 (14:58 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Aug 2012 21:58:43 +0000 (14:58 -0700)
commit2a4aaf133c8bec9bbfcd50c1eb0f25896f579cd1
tree67d924752ee2b6a73f897e7df11378a396764d28
parent9455f8f2667bd86a7e51b19112f759406274e76b
parent2e5b13ef952436a3794d36352f5a2a0381ca4ddf
Merge "resolved conflicts for merge of 86bb2258 to jb-dev-plus-aosp" into jb-dev-plus-aosp