tree d10bfb60daa26a6b22f817a5ef86143cd56fd142
parent 1038247ad4470a8c76d621b399c46024b1db44dd
parent adcd4ee2e42b126d66cc793dcd6e44e049156e30
author Deepanshu Gupta <deepanshu@google.com> 1396581594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396581594 +0000

am adcd4ee2: (-s ours) am 3e4aebdb: am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev

* commit 'adcd4ee2e42b126d66cc793dcd6e44e049156e30':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]