tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 4faba966044bf6ff5ae16518482426b27ca6de04
parent ae136f68d8f9a0045c3e1ab5d9a3965245fced6f
author Mathew Inwood <mathewi@google.com> 1392410182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410182 +0000

am ae136f68: am 79f403e2: am da608c95: Target SDK 19, fix build.

* commit 'ae136f68d8f9a0045c3e1ab5d9a3965245fced6f':