DO NOT MERGE Fix unexpected behavior in SDP
am: 6ee3d8e16c

Change-Id: Ia72f140ecc6f943c2b25a981d8528a00813eb0ff
tree: 3b13eb02190aa99e62bf078a762529d4082f4acd
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE