tree 2e281f84bfd4ffc504d3a4b09c1bed8ce3eaac63
parent 4cc2655a0e445a5d11944208f0ebb3d8480a5964
parent ac2215a6a22dc1335301ea58f45d48852e81a465
author Stuart Scott <stuartscott@google.com> 1384366679 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384366680 +0000

Merge "Moving include to static." into klp-dev