tree 99a4a539b759f976055bd1328c86172aacffcf7b
parent 17766476377588c8d57f0990f3a343d8ad5fadcb
parent ac797fec875a5508e67fc318c747d53da9ebd0e8
author Daniel Xie <dxie@google.com> 1444187551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444187551 +0000

am ac797fec: (-s ours) am 9d26f948: am 33635bc7: am af18aaf5: (-s ours) Merge "DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list" into kitkat-cts-dev

* commit 'ac797fec875a5508e67fc318c747d53da9ebd0e8':
  DO NOT MERGE: Add MyanmarTest#testCompositionSemantics to known failure list