tree be3dcdbb8592133ad84c4ab8c71906b6ce9763d4
parent fd5494b8ef91e8a909622c3bf45dac7537254b41
parent 8de24dca68a34828277bf661d72110a3a3191165
author Dmitry Shmidt <dimitrysh@google.com> 1346873963 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346873963 -0700

Merge "Restore original default Wifi sleep policy (always)" into jb-mr1-dev