OSDN Git Service

am 0413efd2: (-s ours) resolved conflicts for merge of 3bb81eb0 to klp-modular-dev...
authorGriff Hazen <griff@google.com>
Wed, 21 May 2014 03:47:58 +0000 (03:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 May 2014 03:47:58 +0000 (03:47 +0000)
commitf218d8824388174af16b9cb08b1e6da34fcde750
treea60d5aeddacef98561f5e0ee6a05434e9d8bdc76
parent6fdea52a1570f4496d4e8d8f7315ff69d6a12bd1
parent0413efd261c9e6103ec65ff60af3ef22dfc80d19
am 0413efd2: (-s ours) resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp

* commit '0413efd261c9e6103ec65ff60af3ef22dfc80d19':
  Set API version for KKWT. DO NOT MERGE