OSDN Git Service

am 880d3f39: resolved conflicts for merge of 0ac38a4e to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Sat, 11 Aug 2012 22:16:31 +0000 (15:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Aug 2012 22:16:31 +0000 (15:16 -0700)
commitd99a36651079b47ff159ef917cc513fdb5364bef
tree441668cd11c0f024d44c60c6a26b594877c396b8
parent33b8321d2e3ba308e43fd196ce5dfc832a097a69
parent880d3f39f711f9ca6d2ba5c9cf127265fa39efad
am 880d3f39: resolved conflicts for merge of 0ac38a4e to jb-mr1-dev

* commit '880d3f39f711f9ca6d2ba5c9cf127265fa39efad':
  Remove TARGET_linux-sh.mk.