tree 0715734a54cb6631bf06b37225e7957718945a65
parent fff80172cafb42a06fa952a7412faaabe648f7c3
parent 4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d
author Jean-Baptiste Queru <jbq@google.com> 1337615750 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337615750 -0700

am 4495a871: Fix secondary builds (AOSP, panda) - do not merge

* commit '4495a87138cd1f0fdf62a9c4649e2c2bdbd3527d':
  Fix secondary builds (AOSP, panda) - do not merge