OSDN Git Service

am 07baf958: am 775da50d: am bfc9b30d: (-s ours) am 81fc969b: am cf352c5d: Merge...
authorNarayan Kamath <narayan@google.com>
Mon, 12 May 2014 23:29:37 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:29:37 +0000 (23:29 +0000)
commita6b59ad0f4db3ff4e44d30b4ab7db3afaab9e0f0
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent8d1b9b023f071b304813d6b259d7723bc1e2218c
parent07baf95875d4a72f154908aa84fe1ea05a487882
am 07baf958: am 775da50d: am bfc9b30d: (-s ours) am 81fc969b: am cf352c5d: Merge "Add warning message for java6 builds."

* commit '07baf95875d4a72f154908aa84fe1ea05a487882':