tree 4e163618c234e61d5b5252064659766a87f67037
parent fcca815162f9dc4d3ffda483d2f6da6d2a43e984
parent 473a270852c4316f9840f5190b1cdde8db9e1fef
author Deepanshu Gupta <deepanshu@google.com> 1412242218 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412242218 +0000

am 473a2708: am a21ca344: (-s ours) am a2f088b6: Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev

* commit '473a270852c4316f9840f5190b1cdde8db9e1fef':
  Add layoutlib tests to DIST_DIR [DO NOT MERGE]