tree 6dd83fb3d738c3a4dc4530a16ac1c5038761d148
parent 22e84aaefbfca3627b552077c39510128024e3bc
parent 98aa498453efad3bbfb74e63943db24cf9bbe4c1
author The Android Open Source Project <initial-contribution@android.com> 1337391817 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337391817 -0700

Reconcile with jb-release

Change-Id: I439c76c3cae573c9dd875a329131e90ee6083717