tree abf0f87df2dd6784094e82b448a3e6b7a5fc61a9
parent 415c5e6381c57e51874519a457cfd14066789b1c
parent 4af6a3c42e273ab8326bba37f44784b6a6e8cdea
parent 4af6a3c42e273ab8326bba37f44784b6a6e8cdea
author The Android Open Source Project <initial-contribution@android.com> 1352232996 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352232996 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ie60e91e401a97a8a124237eae06b6ccda534290f