OSDN Git Service

Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev
authorWink Saville <wink@google.com>
Fri, 9 Aug 2013 00:09:23 +0000 (00:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 00:09:25 +0000 (00:09 +0000)
commitf5f75cd8f22b3d2986d0e782f6ca4a6bbfeabc21
tree5542833f78d22a636b953c6d2971af944797f433
parent09335703572db7d6a9b43f3aba32074e473d6a0f
parentf35f3201db321c501ea3cdeeae36e88480bbe835
Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev