OSDN Git Service

am d99a3665: am 880d3f39: resolved conflicts for merge of 0ac38a4e to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Sat, 11 Aug 2012 22:18:07 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 11 Aug 2012 22:18:07 +0000 (15:18 -0700)
* commit 'd99a36651079b47ff159ef917cc513fdb5364bef':
  Remove TARGET_linux-sh.mk.


Trivial merge