Kenny Guy 7369cc6145 am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev ...

automerge: a63b620

* commit 'a63b620916e8b4f5c36cfb398bf5f0221466c875':
  Don't show last used and profile button at same time.

2014-12-12 19:03:35 +00:00

..

java

am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev

2014-12-12 19:03:35 +00:00

jni

am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2

2014-12-12 04:35:05 +00:00

res

am dee84a87: am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev automerge: cac8662

2014-12-12 04:12:16 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00