tree a4bd576f93681e90b5e6e20947b0b56c28c95d86
parent 6becc5a811c74a20e72eb8e81fdc5d21361d2d7f
parent 9ce685b934b36cc57631e10f7c1e3609e91e3f9c
author Christopher Tate <ctate@google.com> 1332448761 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332448761 -0700

Merge "Make immersive mode public & imply update locking" into ics-aah