tree 5fd12a8703f1bd361fe1b49d2ab76be62ea23b35
parent 27dbacccc94523aef04ed2558c80fb2fff40f9c1
parent 14799fb52105915a2e3164e2139b9504f509211d
author Stuart Scott <stuartscott@google.com> 1384367130 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384367130 -0800

am 14799fb5: am 0e83bbaa: Merge "Moving include to static." into klp-dev

* commit '14799fb52105915a2e3164e2139b9504f509211d':
  Moving include to static.