tree d8e86a0140d58b98d66a74f30254e252745c036d
parent e1970346a43109a9bcf4037135425a918fc953d3
parent 9086562a6a524cc0c96231411863cd65d8785bfe
author Adam Lesinski <adamlesinski@google.com> 1413573438 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413573440 +0000

Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev