OSDN Git Service

Merge "resolved conflicts for merge of 22d07464 to master"
authorNarayan Kamath <narayan@google.com>
Thu, 27 Mar 2014 14:31:23 +0000 (14:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Mar 2014 14:31:24 +0000 (14:31 +0000)
commitf1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4
tree0ac716c2af4fc41ce7a79f15284883c97314c2a6
parentddaba4360b86f96307ec88f0d0b145425bc3e128
parentecd072161ec57ba8dfb26659511c0f6605601560
Merge "resolved conflicts for merge of 22d07464 to master"