tree cc8181b268797a37c7174c9d755a6810fdf30d09
parent abaa423fa15f00b07b9c92c16ee186c909cac145
parent ec22e2147d07c8a6de7fabeb0c45d22e844d0e6e
author Brian Attwell <brianattwell@google.com> 1423001249 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423001249 +0000

Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-dev