diff options
| author | Joe LaPenna <jlapenna@google.com> | 2015-11-12 23:14:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-12 23:14:29 +0000 |
| commit | 4d93d122bd8c9988cb4239d5aec7401f6ee3c54b (patch) | |
| tree | 7112178d0f0dd57f1e91cf4f45504fc6faf0305b /packages/SettingsLib | |
| parent | 2d43dd3c0e49776589cb21bfbf9b3860623d0bfc (diff) | |
| parent | 516ac154e16324d178fc1343293c4b1d5447ef2c (diff) | |
| download | frameworks_base-4d93d122bd8c9988cb4239d5aec7401f6ee3c54b.zip frameworks_base-4d93d122bd8c9988cb4239d5aec7401f6ee3c54b.tar.gz frameworks_base-4d93d122bd8c9988cb4239d5aec7401f6ee3c54b.tar.bz2 | |
Merge "DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files" into cw-e-dev
am: 516ac154e1 -s ours
* commit '516ac154e16324d178fc1343293c4b1d5447ef2c':
DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files
Diffstat (limited to 'packages/SettingsLib')
0 files changed, 0 insertions, 0 deletions