tree 3aaafae78a7283c9a4f717ac6c0e130bb673453e
parent a1cca5cb0b7ad982983aebac980c4a44827e7eb3
parent 8152502e93edfe2f50d678d6860d3c7d1a8b4865
author Deepanshu Gupta <deepanshu@google.com> 1396577259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396577259 +0000

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

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