tree 9c5fdb4f16d1b95527ab1d2ebb45821694ee69e3
parent 334d98f1ece949414b94924a5bc852810e0bf367
parent b53d97c4571f8ed09e92eee64301969b96ff1e4d
author Craig Mautner <cmautner@google.com> 1382971111 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382971112 +0000

Merge "Change order of operations so flag is not overwritten" into klp-dev