am 609d79a0: am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"
am 609d79a0: am c02bbfb3: am 9fae2ecc: Merge "Handle nested folder case"

* commit '609d79a0ddf7efadf62d6836f6b03dbfbfa7b41d':
  Handle nested folder case

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base