tree e442c774a61bab8ef810c61944f51aca3371becc
parent d509e55025a8d3519bdb8b4d943605a4a422367b
parent aa7ddfd8347fa947618a7668b013521e95722c5c
author Jeff Sharkey <jsharkey@google.com> 1454706079 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454706082 +0000

Merge "Follow constant refactoring in framework."