tree 5aafcd430b7f02ba0260398679cbc55150741da4
parent d8af6f71029df3e53f2b36723d1ca5ec85991af6
parent 1bcd0659b017e49ad6fdacae0b772c1f46ad31fa
author vandwalle <vandwalle@google.com> 1410723786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410723786 +0000

am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev

* commit 'dfb82a243b00ced8f093b54a9ed51c06ab11d7ac':
  make wifi cellular params configurable