tree 10da860fcff71886af91d082e31f0e1917926848
parent 2a6fec7944d1a7df481ad20ed5b342a0b981e67f
parent 6270be2dda05f6f9a7b496233345c857877e3351
author Mathew Inwood <mathewi@google.com> 1414566223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566223 +0000

am 6270be2d: am 78ea90e7: am 3fe985ea: am ae136f68: am 79f403e2: am da608c95: Target SDK 19, fix build.

* commit '6270be2dda05f6f9a7b496233345c857877e3351':