commit | 14ba5479d819563497dc1505703c261088fedcc6 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Tue May 15 17:04:09 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 15 17:04:09 2012 -0700 |
tree | f3c44f5e8b1afe5740ba9c1594b2607684044a64 | |
parent | b1d4cb28db8b08974b651665bf4d1a7926c17b9c [diff] | |
parent | be2c79d9a5439922030d2a3846c81c61f0e16912 [diff] |
Merge "Follow changes in framework." into jb-dev