| commit | cfcec9e1d468708269edbd1e8520d1253989aefb | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Thu Mar 13 08:44:07 2014 -0700 |
| committer | Doug Zongker <dougz@google.com> | Thu Mar 13 08:44:07 2014 -0700 |
| tree | 10485d489baff7a80488b5daf7381916c1fd8b0e | |
| parent | be7eea0a880ed266bb4111dcc3a2159fdb8791d5 [diff] | |
| parent | ea868b3846794cd36424f477503377ea9348137a [diff] |
Merge commit 'ea868b38' into manualmerge Conflicts: screen_ui.cpp screen_ui.h Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb