tree 7a1e260fe75c69de64d4642648b5d062f9af655a
parent d2de6e8688064ec72de88acb95d94adb3467e86f
parent 06d9752018b749a438db5a21e5d0a3d05725db1e
author Xavier Ducrohet <xav@google.com> 1427161044 +0000
committer android-build-merger <android-build-merger@google.com> 1427161044 +0000

am d9e9e60f: (-s ours) Update build tools version to 22.0.2. DO NOT MERGE.
automerge: 06d9752  -s ours

* commit '06d9752018b749a438db5a21e5d0a3d05725db1e':
  Update build tools version to 22.0.2. DO NOT MERGE.