| commit | 8aac1a358f2caf6c21c603bae9c9d4bd075eb155 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Thu May 15 16:02:21 2014 -0700 |
| committer | Evan Charlton <evanc@google.com> | Thu May 15 16:22:56 2014 -0700 |
| tree | 3baa868a0552d36d8d74bdaf2e1a5cfddd2212a1 | |
| parent | 8ef5cf3987ab9f7988d0ce7b033270095e05481d [diff] | |
| parent | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 [diff] |
Merge remote-tracking branch 'goog/master-nova' into merge Conflicts: res/layout/call_card.xml res/values-da/strings.xml res/values-hi/strings.xml src/com/android/incallui/CallButtonPresenter.java src/com/android/incallui/CallCardFragment.java src/com/android/incallui/CallCardPresenter.java src/com/android/incallui/DialpadFragment.java Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462