tree 7fb6118323bb3aacccce08e926ee8628f977bf6d
parent f793af0735101a62c54884d34d1679166c4bd557
parent f700f2152f637733c230c0fee22641ba33df8850
author Kirill Grouchnikov <kirillg@google.com> 1441809239 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441809239 +0000

am f700f215: (-s ours) SDK / support lib update to build #2239354. DO NOT MERGE ANYWHERE

* commit 'f700f2152f637733c230c0fee22641ba33df8850':
  SDK / support lib update to build #2239354. DO NOT MERGE ANYWHERE