tree f845540751bcb2d49b0f657d44e892c104d53258
parent cb1fdea788c17d4421b09cc2e7e4b31c545b9abe
parent 2854d54b94203c3e4070de475edcfcb3f8140507
author Adam Cohen <adamcohen@google.com> 1402506652 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402506652 +0000

am 2854d54b: (-s ours) am a629f268: (-s ours) Merge "Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"" into ub-now-nova

* commit '2854d54b94203c3e4070de475edcfcb3f8140507':
  Revert "Revert transparent bars for L in 3.5. DO NOT MERGE"