tree 4c7ac3abc35bed65e7148b0d092e2806a1c82bfb
parent b72c1b4aaa763864f9102c01ae1154957e923f7f
parent 507689911637f3935d8a584f766d77312da0e40f
author Xavier Ducrohet <xav@google.com> 1416069712 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416069712 +0000

am 50768991: (-s ours) am 6970ca0c: am 55c46211: am fa26ce84: am a19e1e2c: Update build tools version to 21.1.2. DO NOT MERGE.

* commit '507689911637f3935d8a584f766d77312da0e40f':
  Update build tools version to 21.1.2. DO NOT MERGE.