tree d1f86d2a2d864c27ca0005f9a8f53b76c69ca58b
parent ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f
parent 7b727e2e0aedef50aba8e3d4081a643b79329497
author Wink Saville <wink@google.com> 1419012719 +0000
committer android-build-merger <android-build-merger@google.com> 1419012719 +0000

am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
automerge: 7b727e2

* commit '7b727e2e0aedef50aba8e3d4081a643b79329497':
  Update mapping between RAF and Network Type.