tree ce636c6b62e133aab5014cc13ea659398808cb7e
parent 082a1721b5165420e11319b98eefaa35d0feb844
parent d999e534873606b93626cf8e76201c018272b893
author Akira Oshimi <akira.x.oshimi@sonymobile.com> 1484151113 +0000
committer android-build-merger <android-build-merger@google.com> 1484151113 +0000

Merge "Fix clipping for edit screen of Quick Settings" am: e3677865a8 am: 49b68ad0cd
am: d999e53487

Change-Id: I7a1420c595f187923ad565d080e05c15c98d7dce