tree afe08c04cc067d9f3fee8b3b000e2ec05013f2cd
parent 1ecc575685bb9f6786e4115a470cdbed1c9ee800
parent 2c13b8f601f55a7e1a8ed20ecdeb9f214ffd8741
author Stuart Scott <stuartscott@google.com> 1396464575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396464575 +0000

am 2c13b8f6: am 760a3755: am 66f39f9e: am b27e16e4: am 240a6ede: Merge "Creating location for shared code and porting the libs." into jb-dev

* commit '2c13b8f601f55a7e1a8ed20ecdeb9f214ffd8741':
  Creating location for shared code and porting the libs.