Merge "Verify component count is in the legal range." into lmp-dev
authorJarkko Pöyry <jpoyry@google.com>
Fri, 26 Sep 2014 02:28:12 +0000 (02:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 Sep 2014 02:28:13 +0000 (02:28 +0000)

Trivial merge