01ce57f92f49c0482ea0761c0529292e8c065196
fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
* commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56':
Merge c5aeac7f from honeycomb.
Use the new API file format, and some minor tweaks to the old XML files that make the parser easier.
am
ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
am
6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
am
7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%