tree e83716dfba34d4c0b3c1a779458fd6fa4f21f262
parent 58b9ee28262a608853dbb1134b5a79cf7fdce502
parent cd6f00c3a05717862a88b7409d11176ae53fd9a9
author Adam Lesinski <adamlesinski@google.com> 1416253404 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416253404 +0000

am cd6f00c3: Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev

* commit 'cd6f00c3a05717862a88b7409d11176ae53fd9a9':
  Implement back-tracking when searching for attributes in XML or resource bag