tree b6fcc502eceb58bfda03fcc60f597ce121b56585
parent ca48276c03af29e1e7f221f96bd2699cd4fa13c3
parent ae08d213dd073f18ec81ac00f74b097107b40631
author The Android Open Source Project <initial-contribution@android.com> 1337875280 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337875280 -0700

Reconcile with jb-release

Change-Id: I8b082311ec344c83c7483b92e1066799b0d14986