tree ababc0f3b85480a1ceabdacd8664098ad1398639
parent 424edf064fb705b07f5f7d41e875dd2b24ccf271
parent f2db00fdcd4e3dd97afd071f3af058d307a152f9
author Brian Carlstrom <bdc@google.com> 1399493968 -0700
committer Brian Carlstrom <bdc@google.com> 1399494023 -0700

resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp

Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0