OSDN Git Service

am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
authorJean-Baptiste Queru <jbq@google.com>
Sat, 21 Aug 2010 02:22:51 +0000 (19:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 21 Aug 2010 02:22:51 +0000 (19:22 -0700)
Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

* commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d':
  Better way to disable OTAs for crespo - DO NOT MERGE

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge