tree f94731df5b03a572c8dc4b6b2c4c1f29464c49a0
parent 70775beddd3773a942084f5ef939da0a70065475
parent c8e3784e259a1c668193a6590570847c9cd9310b
author Shishir Agrawal <shishir@google.com> 1425336899 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425336899 +0000

am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit 'c8e3784e259a1c668193a6590570847c9cd9310b':
  Fix incorrect condition for sub id check.