tree e85fe75fc919f46edc7e9ab9cbf5eeb672ed433f
parent 9d0a4a6eca86933e9cd1fd60ba8cc0abae351b2a
parent 261307bebe8986599055bb97d5587977c8da53eb
author Raphael Moll <raphael@google.com> 1400628946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400628946 +0000

am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master

* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.