tree 6203c03856eb2da67e0ce15be76ba3e4d7e7913f
parent 25a25ebdd1cca5fa42ef20d4d55c3e49da294380
parent 3174ac1ba34f26d6f14812e22905007bde96cce9
author The Android Open Source Project <initial-contribution@android.com> 1337717111 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337717111 -0700

Reconcile with jb-release

Change-Id: I1f173833b337368c87084eccddb4d9b7d46294fd