tree 76ad02a04ed55a8c1b020ac86536cb21a90a08a7
parent cdd271d421136593553e3c32aa4b98fc4f5268f3
parent d270028c1015aefb7c538d07c8c5b23bb43ac980
parent 11dc1b3686b1346742f4e686cbbeb4afd59dbb66
author The Android Open Source Project <initial-contribution@android.com> 1370540238 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1370540238 -0700

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I7ad4d9cdf2b0e666af7ac5791eb357703900969c